From 4d3721a1fc31de56bf2ba89587a1c7dd6cf2df5e Mon Sep 17 00:00:00 2001 From: Jeroen van der Heijden Date: Wed, 26 Feb 2020 17:03:04 +0100 Subject: [PATCH] Solve mac os warnings --- include/siri/grammar/gramp.h | 4 ++-- include/siri/siri.h | 4 ++-- src/siri/db/shard.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/siri/grammar/gramp.h b/include/siri/grammar/gramp.h index ae782329..1c1826f9 100644 --- a/include/siri/grammar/gramp.h +++ b/include/siri/grammar/gramp.h @@ -26,8 +26,8 @@ #if CLERI_VERSION_MINOR >= 12 -#define CLERI_NODE_DATA(__node) ((intptr_t)(__node)->data) -#define CLERI_NODE_DATA_ADDR(__node) ((intptr_t *) &(__node)->data) +#define CLERI_NODE_DATA(__node) ((int64_t)(__node)->data) +#define CLERI_NODE_DATA_ADDR(__node) ((int64_t *) &(__node)->data) #else #define CLERI_NODE_DATA(__node) (__node)->result #define CLERI_NODE_DATA_ADDR(__node) &(__node)->result diff --git a/include/siri/siri.h b/include/siri/siri.h index ec42665d..a029c279 100644 --- a/include/siri/siri.h +++ b/include/siri/siri.h @@ -20,10 +20,10 @@ #define MAX_NUMBER_DB 1024 #if defined(__GLIBC__) -#define strerror_s(__err, __buf, __sz) \ +#define strerror_si(__err, __buf, __sz) \ strerror_r(__err, __buf, __sz) #else -#define strerror_s(__err, __buf, __sz) \ +#define strerror_si(__err, __buf, __sz) \ (strerror_r(__err, __buf, __sz) == 0 ? __buf : "unexpected error") #endif diff --git a/src/siri/db/shard.c b/src/siri/db/shard.c index cd89df90..87dbe11f 100644 --- a/src/siri/db/shard.c +++ b/src/siri/db/shard.c @@ -335,7 +335,7 @@ siridb_shard_t * siridb_shard_create( { char buf[1024]; log_critical("Cannot create shard file: '%s' (%s)", - shard->fn, strerror_s(errno, buf, sizeof(buf))); + shard->fn, strerror_si(errno, buf, sizeof(buf))); siridb_shard_decref(shard); ERR_FILE return NULL; @@ -359,7 +359,7 @@ siridb_shard_t * siridb_shard_create( { char buf[1024]; log_critical("Cannot write to shard file: '%s' (%s)", - shard->fn, strerror_s(errno, buf, sizeof(buf))); + shard->fn, strerror_si(errno, buf, sizeof(buf))); fclose(fp); siridb_shard_decref(shard); ERR_FILE @@ -370,7 +370,7 @@ siridb_shard_t * siridb_shard_create( { char buf[1024]; log_critical("Cannot close shard file: '%s' (%s)", - shard->fn, strerror_s(errno, buf, sizeof(buf))); + shard->fn, strerror_si(errno, buf, sizeof(buf))); siridb_shard_decref(shard); ERR_FILE return NULL; -- 2.30.2